More gtk-demo spacing fixes

diff --git a/demos/gtk-demo/colorsel.c b/demos/gtk-demo/colorsel.c
index b75bb26a0266eec795724a63986e4424dabe4aab..fce3786d6bedcfe9ffafcd3a719aa195afa784bb 100644 (file)
--- a/demos/gtk-demo/colorsel.c
+++ b/demos/gtk-demo/colorsel.c
@@ -75,6 +75,7 @@ do_colorsel (GtkWidget *do_widget)
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
+      g_object_set (vbox, "margin", 12, NULL);
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
       /*

diff --git a/demos/gtk-demo/combobox.c b/demos/gtk-demo/combobox.c
index 6ebac749a3f4f0e5503ae88031d8cc6bd0b71b76..930a3b550a60d3b6b0b333ea5eab51c5f9ccb67a 100644 (file)
--- a/demos/gtk-demo/combobox.c
+++ b/demos/gtk-demo/combobox.c
@@ -319,6 +319,7 @@ do_combobox (GtkWidget *do_widget)
                       G_CALLBACK (gtk_widget_destroyed), &window);
 
     vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+    g_object_set (vbox, "margin", 10, NULL);
     gtk_container_add (GTK_CONTAINER (window), vbox);
 
     /* A combobox demonstrating cell renderers, separators and
@@ -328,6 +329,7 @@ do_combobox (GtkWidget *do_widget)
     gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
 
     box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+    g_object_set (box, "margin", 5, NULL);
     gtk_container_add (GTK_CONTAINER (frame), box);
 
     model = create_icon_store ();
@@ -368,6 +370,7 @@ do_combobox (GtkWidget *do_widget)
     gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
 
     box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+    g_object_set (box, "margin", 5, NULL);
     gtk_container_add (GTK_CONTAINER (frame), box);
 
     model = create_capital_store ();
@@ -395,6 +398,7 @@ do_combobox (GtkWidget *do_widget)
     gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
 
     box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+    g_object_set (box, "margin", 5, NULL);
     gtk_container_add (GTK_CONTAINER (frame), box);
 
     combo = gtk_combo_box_text_new_with_entry ();
@@ -412,6 +416,7 @@ do_combobox (GtkWidget *do_widget)
     gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
 
     box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+    g_object_set (box, "margin", 5, NULL);
     gtk_container_add (GTK_CONTAINER (frame), box);
 
     combo = gtk_combo_box_text_new ();

diff --git a/demos/gtk-demo/dialog.c b/demos/gtk-demo/dialog.c
index 362e27e1f60839e5b676518e9799105dc1948c04..b89156db4e3d251f446a1deaa5be0351a7011469 100644 (file)
--- a/demos/gtk-demo/dialog.c
+++ b/demos/gtk-demo/dialog.c
@@ -114,9 +114,11 @@ do_dialog (GtkWidget *do_widget)
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
       frame = gtk_frame_new ("Dialogs");
+      g_object_set (frame, "margin", 8, NULL);
       gtk_container_add (GTK_CONTAINER (window), frame);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
+      g_object_set (vbox, "margin", 8, NULL);
       gtk_container_add (GTK_CONTAINER (frame), vbox);
 
       /* Standard message dialog */

diff --git a/demos/gtk-demo/drawingarea.c b/demos/gtk-demo/drawingarea.c
index ac031330f0c5547a6776dfc264b19b2d04df7f04..7e41fbecfcc4894d84e1b184042326c4b1db36a8 100644 (file)
--- a/demos/gtk-demo/drawingarea.c
+++ b/demos/gtk-demo/drawingarea.c
@@ -216,6 +216,7 @@ do_drawingarea (GtkWidget *do_widget)
                         G_CALLBACK (close_window), NULL);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
+      g_object_set (vbox, "margin", 16, NULL);
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
       /*

diff --git a/demos/gtk-demo/editable_cells.c b/demos/gtk-demo/editable_cells.c
index 770091bdc5a512e64741a9c96c12177169adc233..a45bd52c1369f5bbc6c4f684213b47098f964700 100644 (file)
--- a/demos/gtk-demo/editable_cells.c
+++ b/demos/gtk-demo/editable_cells.c
@@ -353,6 +353,7 @@ do_editable_cells (GtkWidget *do_widget)
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
+      g_object_set (vbox, "margin", 5, NULL);
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
       gtk_box_pack_start (GTK_BOX (vbox),

diff --git a/demos/gtk-demo/entry_buffer.c b/demos/gtk-demo/entry_buffer.c
index 7e7094d21a68dc34bbbb780d84a90e74ac94d2b1..497d51db2b79bc16465b2e812b4493e055ae4960 100644 (file)
--- a/demos/gtk-demo/entry_buffer.c
+++ b/demos/gtk-demo/entry_buffer.c
@@ -28,6 +28,7 @@ do_entry_buffer (GtkWidget *do_widget)
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
+      g_object_set (vbox, "margin", 5, NULL);
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
       label = gtk_label_new (NULL);

diff --git a/demos/gtk-demo/entry_completion.c b/demos/gtk-demo/entry_completion.c
index c3bee99de1acb347131f95ee0c1f884bab0cb32e..c502b12c5575a751edc74a27e8dad9d0987e3e0e 100644 (file)
--- a/demos/gtk-demo/entry_completion.c
+++ b/demos/gtk-demo/entry_completion.c
@@ -55,6 +55,7 @@ do_entry_completion (GtkWidget *do_widget)
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
+      g_object_set (vbox, "margin", 5, NULL);
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
       label = gtk_label_new (NULL);

diff --git a/demos/gtk-demo/filtermodel.ui b/demos/gtk-demo/filtermodel.ui
index 3b39095bd6e28b0f798e590ff34a8a6336f25a9b..83db91e36a9e22f12b7b69c38056988752b69677 100644 (file)
--- a/demos/gtk-demo/filtermodel.ui
+++ b/demos/gtk-demo/filtermodel.ui
@@ -35,10 +35,7 @@
     <child>
       <object class="GtkGrid" id="grid1">
         <property name="visible">1</property>
-        <property name="margin_left">10</property>
-        <property name="margin_right">10</property>
-        <property name="margin_top">10</property>
-        <property name="margin_bottom">10</property>
+        <property name="margin">10</property>
         <property name="row_spacing">10</property>
         <property name="column_spacing">10</property>
         <property name="column_homogeneous">1</property>

diff --git a/demos/gtk-demo/glarea.c b/demos/gtk-demo/glarea.c
index 51b848dce02034599ca9b21dc39820ad77eab6de..b1d14ef4695f54fdc00e988e32c7b5c104b0bda9 100644 (file)
--- a/demos/gtk-demo/glarea.c
+++ b/demos/gtk-demo/glarea.c
@@ -396,6 +396,7 @@ create_glarea_window (GtkWidget *do_widget)
   g_signal_connect (window, "destroy", G_CALLBACK (close_window), NULL);
 
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE);
+  g_object_set (box, "margin", 12, NULL);
   gtk_box_set_spacing (GTK_BOX (box), 6);
   gtk_container_add (GTK_CONTAINER (window), box);
 

diff --git a/demos/gtk-demo/images.c b/demos/gtk-demo/images.c
index eecb72849eb547bcf728ab4fd21008a72c90faa3..43976474821fd012e0d3cbc4e63317e6be83418f 100644 (file)
--- a/demos/gtk-demo/images.c
+++ b/demos/gtk-demo/images.c
@@ -348,6 +348,7 @@ do_images (GtkWidget *do_widget)
                         G_CALLBACK (cleanup_callback), NULL);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
+      g_object_set (vbox, "margin", 16, NULL);
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
       label = gtk_label_new (NULL);

diff --git a/demos/gtk-demo/infobar.c b/demos/gtk-demo/infobar.c
index 8dbea04c7f5e6b57bc8551784e12539239733a32..f58d57e0ce86f5f901fb42b24199a37ba12bd7ed 100644 (file)
--- a/demos/gtk-demo/infobar.c
+++ b/demos/gtk-demo/infobar.c
@@ -61,6 +61,7 @@ do_infobar (GtkWidget *do_widget)
       g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+      g_object_set (vbox, "margin", 8, NULL);
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
       bar = gtk_info_bar_new ();
@@ -131,6 +132,7 @@ do_infobar (GtkWidget *do_widget)
       gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
 
       vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
+      g_object_set (vbox2, "margin", 8, NULL);
       gtk_container_add (GTK_CONTAINER (frame), vbox2);
 
       /* Standard message dialog */

diff --git a/demos/gtk-demo/list_store.c b/demos/gtk-demo/list_store.c
index 2fa12ce4af2ec3f858b6b3ad5f5ec10174f7a0a3..3ca17b9938455104957925f466665a5ffb85fc40 100644 (file)
--- a/demos/gtk-demo/list_store.c
+++ b/demos/gtk-demo/list_store.c
@@ -264,6 +264,7 @@ do_list_store (GtkWidget *do_widget)
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
+      g_object_set (vbox, "margin", 8, NULL);
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
       label = gtk_label_new ("This is the bug list (note: not based on real data, it would be nice to have a nice ODBC interface to bugzilla or so, though).");

diff --git a/demos/gtk-demo/panes.c b/demos/gtk-demo/panes.c
index 3fb0ef05319394cbfd23ce2312d4211ea4bf9cf2..e6b2cd4a6618ed06df9c50bd560f699d11805262 100644 (file)
--- a/demos/gtk-demo/panes.c
+++ b/demos/gtk-demo/panes.c
@@ -85,6 +85,7 @@ create_pane_options (GtkPaned    *paned,
   child2 = gtk_paned_get_child2 (paned);
 
   frame = gtk_frame_new (frame_label);
+  g_object_set (frame, "margin", 4, NULL);
 
   table = gtk_grid_new ();
   gtk_container_add (GTK_CONTAINER (frame), table);
@@ -146,6 +147,7 @@ do_panes (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
       vpaned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
+      g_object_set (vpaned, "margin", 5, NULL);
       gtk_box_pack_start (GTK_BOX (vbox), vpaned, TRUE, TRUE);
 
       hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);

diff --git a/demos/gtk-demo/pickers.c b/demos/gtk-demo/pickers.c
index 54daaf0329d1d59b9a81edc5f875ead505541070..fbc9b3ba3409ed64db69039d419ea05c3794b843 100644 (file)
--- a/demos/gtk-demo/pickers.c
+++ b/demos/gtk-demo/pickers.c
@@ -23,6 +23,7 @@ do_pickers (GtkWidget *do_widget)
                       G_CALLBACK (gtk_widget_destroyed), &window);
 
     table = gtk_grid_new ();
+    g_object_set (table, "margin", 20, NULL);
     gtk_grid_set_row_spacing (GTK_GRID (table), 3);
     gtk_grid_set_column_spacing (GTK_GRID (table), 10);
     gtk_container_add (GTK_CONTAINER (window), table);

diff --git a/demos/gtk-demo/popover.c b/demos/gtk-demo/popover.c
index ec79b97c39ead1ecbe29cd36d90d072addab3531..c3425a97b71251c95dc5ddb73aee28ce11a7941e 100644 (file)
--- a/demos/gtk-demo/popover.c
+++ b/demos/gtk-demo/popover.c
@@ -25,6 +25,7 @@ create_popover (GtkWidget       *parent,
   popover = gtk_popover_new (parent);
   gtk_popover_set_position (GTK_POPOVER (popover), pos);
   gtk_container_add (GTK_CONTAINER (popover), child);
+  g_object_set (child, "margin", 6, NULL);
   gtk_widget_show (child);
 
   return popover;
@@ -131,6 +132,7 @@ do_popover (GtkWidget *do_widget)
     {
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 24);
+      g_object_set (box, "margin", 24, NULL);
       gtk_container_add (GTK_CONTAINER (window), box);
 
       g_signal_connect (window, "destroy",

diff --git a/demos/gtk-demo/scale.ui b/demos/gtk-demo/scale.ui
index 521b3f2c45f4f84ff620f75a4a0a2c1611742789..b9e8ea8e2ffa45041bbe51eaf361222a175d18f3 100644 (file)
--- a/demos/gtk-demo/scale.ui
+++ b/demos/gtk-demo/scale.ui
@@ -26,6 +26,7 @@
         <property name="visible">1</property>
         <property name="row-spacing">10</property>
         <property name="column-spacing">10</property>
+        <property name="margin">20</property>
         <child>
           <object class="GtkLabel">
             <property name="visible">1</property>

diff --git a/demos/gtk-demo/search_entry.c b/demos/gtk-demo/search_entry.c
index 09743e5cc4d87badff3e500ba156f1c098f6ced8..cc93e2395e8b609cdf5a392c426f89471a28db3c 100644 (file)
--- a/demos/gtk-demo/search_entry.c
+++ b/demos/gtk-demo/search_entry.c
@@ -238,6 +238,7 @@ do_search_entry (GtkWidget *do_widget)
                         G_CALLBACK (search_entry_destroyed), &window);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
+      g_object_set (vbox, "margin", 5, NULL);
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
       label = gtk_label_new (NULL);

diff --git a/demos/gtk-demo/sizegroup.c b/demos/gtk-demo/sizegroup.c
index 424555895df1e35b7c8a28e8893b844abfc38f47..e690ec8d16f750a020a5436ae535d3e3ebe5db8d 100644 (file)
--- a/demos/gtk-demo/sizegroup.c
+++ b/demos/gtk-demo/sizegroup.c
@@ -108,6 +108,7 @@ do_sizegroup (GtkWidget *do_widget)
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
+      g_object_set (vbox, "margin", 5, NULL);
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
       size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
@@ -118,6 +119,7 @@ do_sizegroup (GtkWidget *do_widget)
       gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE);
 
       table = gtk_grid_new ();
+      g_object_set (table, "margin", 5, NULL);
       gtk_grid_set_row_spacing (GTK_GRID (table), 5);
       gtk_grid_set_column_spacing (GTK_GRID (table), 10);
       gtk_container_add (GTK_CONTAINER (frame), table);
@@ -130,6 +132,7 @@ do_sizegroup (GtkWidget *do_widget)
       gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
 
       table = gtk_grid_new ();
+      g_object_set (table, "margin", 5, NULL);
       gtk_grid_set_row_spacing (GTK_GRID (table), 5);
       gtk_grid_set_column_spacing (GTK_GRID (table), 10);
       gtk_container_add (GTK_CONTAINER (frame), table);

diff --git a/demos/gtk-demo/spinner.c b/demos/gtk-demo/spinner.c
index 597fe7a60fb7c9f498a3c0bd0add487d28062c44..3dbb8c958dd0c5981856cfa163f5b820ddebea5f 100644 (file)
--- a/demos/gtk-demo/spinner.c
+++ b/demos/gtk-demo/spinner.c
@@ -52,6 +52,7 @@ do_spinner (GtkWidget *do_widget)
     content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
 
     vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
+    g_object_set (vbox, "margin", 5, NULL);
     gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE);
 
     /* Sensitive */

diff --git a/demos/gtk-demo/theming.ui b/demos/gtk-demo/theming.ui
index 617a2f723d048210cb94df60b1dd540ac7e26fb2..7d3c1037335d1f3c6aae638ee7370e79e53e1b23 100644 (file)
--- a/demos/gtk-demo/theming.ui
+++ b/demos/gtk-demo/theming.ui
@@ -13,9 +13,7 @@
         </style>
         <child>
           <object class="GtkToggleToolButton">
-            <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
-            <property name="use_action_appearance">0</property>
             <property name="label" translatable="yes">Normal</property>
             <property name="use_underline">1</property>
             <property name="is_important">1</property>
@@ -27,9 +25,7 @@
         </child>
         <child>
           <object class="GtkToggleToolButton">
-            <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
-            <property name="use_action_appearance">0</property>
             <property name="label" translatable="yes">Active</property>
             <property name="use_underline">1</property>
             <property name="is_important">1</property>
@@ -42,7 +38,6 @@
         </child>
         <child>
           <object class="GtkToggleToolButton">
-            <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <property name="sensitive">0</property>
             <property name="label" translatable="yes">Insensitive</property>
@@ -56,7 +51,6 @@
         </child>
         <child>
           <object class="GtkToggleToolButton">
-            <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <property name="label" translatable="yes">Raised</property>
             <property name="use_underline">1</property>
@@ -72,7 +66,6 @@
         </child>
         <child>
           <object class="GtkToggleToolButton">
-            <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <property name="label" translatable="yes">Raised Active</property>
             <property name="use_underline">1</property>
@@ -89,7 +82,6 @@
         </child>
         <child>
           <object class="GtkToggleToolButton">
-            <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <property name="sensitive">0</property>
             <property name="label" translatable="yes">Insensitive Active</property>
@@ -104,7 +96,6 @@
         </child>
         <child>
           <object class="GtkToolItem">
-            <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <child>
               <object class="GtkEntry" id="entry1">
@@ -119,7 +110,6 @@
         </child>
         <child>
           <object class="GtkToolItem">
-            <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <child>
               <object class="GtkSwitch" id="switch1">
@@ -142,21 +132,17 @@
         <child>
           <object class="GtkButton">
             <property name="label" translatable="yes">Hi, I am a button</property>
-            <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <property name="can_focus">1</property>
             <property name="receives_default">1</property>
-            <property name="use_action_appearance">0</property>
           </object>
         </child>
         <child>
           <object class="GtkButton">
             <property name="label" translatable="yes">And I'm another button</property>
-            <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <property name="can_focus">1</property>
             <property name="receives_default">1</property>
-            <property name="use_action_appearance">0</property>
           </object>
           <packing>
             <property name="position">1</property>
@@ -165,11 +151,9 @@
         <child>
           <object class="GtkButton">
             <property name="label" translatable="yes">This is a button party!</property>
-            <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <property name="can_focus">1</property>
             <property name="receives_default">1</property>
-            <property name="use_action_appearance">0</property>
           </object>
           <packing>
             <property name="position">2</property>
@@ -188,9 +172,7 @@
         </style>
         <child>
           <object class="GtkToggleToolButton">
-            <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
-            <property name="use_action_appearance">0</property>
             <property name="label" translatable="yes">Normal</property>
             <property name="use_underline">1</property>
             <property name="icon_name">list-add-symbolic</property>
@@ -201,9 +183,7 @@
         </child>
         <child>
           <object class="GtkToggleToolButton">
-            <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
-            <property name="use_action_appearance">0</property>
             <property name="label" translatable="yes">Normal</property>
             <property name="use_underline">1</property>
             <property name="icon_name">list-add-symbolic</property>
@@ -214,9 +194,6 @@
         </child>
         <child>
           <object class="GtkToggleToolButton">
-            <property name="use_action_appearance">0</property>
-            <property name="visible">1</property>
-            <property name="use_action_appearance">0</property>
             <property name="label" translatable="yes">Active</property>
             <property name="use_underline">1</property>
             <property name="icon_name">list-remove-symbolic</property>
@@ -228,9 +205,7 @@
         </child>
         <child>
           <object class="GtkToggleToolButton">
-            <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
-            <property name="use_action_appearance">0</property>
             <property name="label" translatable="yes">Active</property>
             <property name="use_underline">1</property>
             <property name="icon_name">list-remove-symbolic</property>
@@ -242,10 +217,8 @@
         </child>
         <child>
           <object class="GtkToggleToolButton">
-            <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <property name="sensitive">0</property>
-            <property name="use_action_appearance">0</property>
             <property name="label" translatable="yes">Insensitive</property>
             <property name="use_underline">1</property>
             <property name="icon_name">edit-find-symbolic</property>
@@ -256,10 +229,8 @@
         </child>
         <child>
           <object class="GtkToggleToolButton">
-            <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <property name="sensitive">0</property>
-            <property name="use_action_appearance">0</property>
             <property name="label" translatable="yes">Insensitive Active</property>
             <property name="use_underline">1</property>
             <property name="icon_name">go-up-symbolic</property>

diff --git a/demos/gtk-demo/toolpalette.c b/demos/gtk-demo/toolpalette.c
index b158cf3288bde0cc29354f6bfc264c15be0eff8c..7ebaf25244ec46abd76a426ad09750ca23b447d1 100644 (file)
--- a/demos/gtk-demo/toolpalette.c
+++ b/demos/gtk-demo/toolpalette.c
@@ -446,6 +446,7 @@ do_toolpalette (GtkWidget *do_widget)
 
       /* Add widgets to control the ToolPalette appearance: */
       box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+      g_object_set (box, "margin", 6, NULL);
       gtk_container_add (GTK_CONTAINER (window), box);
 
       /* Orientation combo box: */
@@ -528,6 +529,7 @@ do_toolpalette (GtkWidget *do_widget)
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (palette_scroller),
                                       GTK_POLICY_NEVER,
                                       GTK_POLICY_AUTOMATIC);
+      g_object_set (palette_scroller, "margin", 6, NULL);
       gtk_widget_set_hexpand (palette_scroller, TRUE);
 
       gtk_container_add (GTK_CONTAINER (palette_scroller), palette);
@@ -547,6 +549,7 @@ do_toolpalette (GtkWidget *do_widget)
       /* ===== notebook ===== */
 
       notebook = gtk_notebook_new ();
+      g_object_set (notebook, "margin", 6, NULL);
       gtk_box_pack_end (GTK_BOX(hbox), notebook, FALSE, FALSE);
 
       /* ===== DnD for tool items ===== */
@@ -586,6 +589,7 @@ do_toolpalette (GtkWidget *do_widget)
       gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
                                 contents_scroller,
                                 gtk_label_new ("Passive DnD Mode"));
+      g_object_set (contents_scroller, "margin", 6, NULL);
 
       /* ===== interactive DnD dest ===== */
 

diff --git a/demos/gtk-demo/tree_store.c b/demos/gtk-demo/tree_store.c
index 32ec14c8afa488f9b50910af77edfad72847c613..87c28e4562f3696ef2b0e2daa7e7755cc560bc5d 100644 (file)
--- a/demos/gtk-demo/tree_store.c
+++ b/demos/gtk-demo/tree_store.c
@@ -398,6 +398,7 @@ do_tree_store (GtkWidget *do_widget)
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
+      g_object_set (vbox, "margin", 8, NULL);
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
       gtk_box_pack_start (GTK_BOX (vbox),